Fix the position of the popup window when in RTL mode. (#127578)

Sat Dec  6 01:13:09 2003  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkcombo.c (gtk_combo_get_pos): Fix the position of the
	popup window when in RTL mode.  (#127578)

diff --git a/ChangeLog b/ChangeLog
index a886f8f11d896c97c27c6520b9ff666ae6057680..b7dfc3da7e3c15074b3085686c1dad40881f3218 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec  6 01:13:09 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombo.c (gtk_combo_get_pos): Fix the position of the 
+       popup window when in RTL mode.  (#127578)
+
 Fri Dec  5 15:30:16 2003  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkaccelgroup.c (quick_accel_find): Applied patch from

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a886f8f11d896c97c27c6520b9ff666ae6057680..b7dfc3da7e3c15074b3085686c1dad40881f3218 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sat Dec  6 01:13:09 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombo.c (gtk_combo_get_pos): Fix the position of the 
+       popup window when in RTL mode.  (#127578)
+
 Fri Dec  5 15:30:16 2003  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkaccelgroup.c (quick_accel_find): Applied patch from

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a886f8f11d896c97c27c6520b9ff666ae6057680..b7dfc3da7e3c15074b3085686c1dad40881f3218 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sat Dec  6 01:13:09 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombo.c (gtk_combo_get_pos): Fix the position of the 
+       popup window when in RTL mode.  (#127578)
+
 Fri Dec  5 15:30:16 2003  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkaccelgroup.c (quick_accel_find): Applied patch from

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a886f8f11d896c97c27c6520b9ff666ae6057680..b7dfc3da7e3c15074b3085686c1dad40881f3218 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sat Dec  6 01:13:09 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombo.c (gtk_combo_get_pos): Fix the position of the 
+       popup window when in RTL mode.  (#127578)
+
 Fri Dec  5 15:30:16 2003  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkaccelgroup.c (quick_accel_find): Applied patch from

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a886f8f11d896c97c27c6520b9ff666ae6057680..b7dfc3da7e3c15074b3085686c1dad40881f3218 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sat Dec  6 01:13:09 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombo.c (gtk_combo_get_pos): Fix the position of the 
+       popup window when in RTL mode.  (#127578)
+
 Fri Dec  5 15:30:16 2003  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkaccelgroup.c (quick_accel_find): Applied patch from

diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c
index 4c17f32fcedca7f8862bd9562825cc8ae497ae04..52744fb539df6a68e803cc82412f2384b13a23a8 100644 (file)
--- a/gtk/gtkcombo.c
+++ b/gtk/gtkcombo.c
@@ -444,6 +444,8 @@ gtk_combo_get_pos (GtkCombo * combo, gint * x, gint * y, gint * height, gint * w
   scrollbar_spacing = _gtk_scrolled_window_get_scrollbar_spacing (popup);
 
   gdk_window_get_origin (combo->entry->window, x, y);
+  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) 
+    *x -= widget->allocation.width - combo->entry->allocation.width;
   real_height = MIN (combo->entry->requisition.height, 
                     combo->entry->allocation.height);
   *y += real_height;